Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 27 Apr 2011 07:56:38 +0000 (00:56 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 27 Apr 2011 07:56:38 +0000 (00:56 -0700)

Trivial merge